ia64: Fix the build after max_cstate changes.

Signed-off-by: Keir Fraser <keir.fraser@citrix.com>

diff --git a/xen/drivers/acpi/pmstat.c b/xen/drivers/acpi/pmstat.c
index 8125e88951e4350d65c0671e94fc520772005e96..33954307d7de197ff3bcb40765422a8052f7c374 100644 (file)
--- a/xen/drivers/acpi/pmstat.c
+++ b/xen/drivers/acpi/pmstat.c
@@ -530,13 +530,13 @@ int do_pm_op(struct xen_sysctl_pm_op *op)
 
     case XEN_SYSCTL_pm_op_get_max_cstate:
     {
-        op->get_max_cstate = max_cstate;
+        op->get_max_cstate = acpi_get_cstate_limit();
         break;
     }
 
     case XEN_SYSCTL_pm_op_set_max_cstate:
     {
-        max_cstate = op->set_max_cstate;
+        acpi_set_cstate_limit(op->set_max_cstate);
         break;
     }
 

diff --git a/xen/include/asm-x86/config.h b/xen/include/asm-x86/config.h
index 9d140ef891d0696ade4334dfd2e3a9f829a9a0e8..3e05dbf0bb6dbd45c6524098f29a0ac2312df8bb 100644 (file)
--- a/xen/include/asm-x86/config.h
+++ b/xen/include/asm-x86/config.h
@@ -35,6 +35,7 @@
 #define CONFIG_ACPI_SLEEP 1
 #define CONFIG_ACPI_NUMA 1
 #define CONFIG_ACPI_SRAT 1
+#define CONFIG_ACPI_CSTATE 1
 
 #define CONFIG_VGA 1
 

diff --git a/xen/include/xen/acpi.h b/xen/include/xen/acpi.h
index cbf795aeaf179de595c422dac9bd49b86fe3fef5..43bdade6c46d8996d0b0fda3cce77dec5df3f89c 100644 (file)
--- a/xen/include/xen/acpi.h
+++ b/xen/include/xen/acpi.h
@@ -402,9 +402,7 @@ static inline int acpi_blacklisted(void)
 
 #endif /*!CONFIG_ACPI_INTERPRETER*/
 
-#define        ACPI_CSTATE_LIMIT_DEFINED       /* for driver builds */
-#ifdef CONFIG_ACPI
-
+#ifdef CONFIG_ACPI_CSTATE
 /*
  * Set highest legal C-state
  * 0: C0 okay, but not C1